ncbi-blast+ 2.17.0+ds-5: Fix wgsread.cpp for x32 (#1117023).

diff --git a/debian/changelog b/debian/changelog
index 0ed0c3330a96daa09d54a0e065022eedabfba6cd..c4f7eba4b449217fd69c94c9b380d5295d03e4a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ncbi-blast+ (2.17.0+ds-5) unstable; urgency=medium
+
+  * debian/patches/support_x32: Fix wgsread.cpp for 32-bit architectures.
+    (Closes: #1117023.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 17 Oct 2025 10:12:47 -0400
+
 ncbi-blast+ (2.17.0+ds-4) unstable; urgency=medium
 
   * debian/patches/support_x32: Correctly broaden configure(.ac)'s VDB

diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
index 48232c31f9e92ddc588b1a66df2dc0ee618045d4..016f095a71530741026ad1e0ee5886e0245a574c 100644 (file)
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -36,3 +36,15 @@ Avoid picking up wrong inline assembly.
              linux*:aarch64* ) vdb_libpath=linux/$vdb_mode/arm64/lib  ;;
              * )
                 if test -n "$with_vdb"; then
+--- a/c++/src/sra/readers/sra/wgsread.cpp
++++ b/c++/src/sra/readers/sra/wgsread.cpp
+@@ -6185,7 +6185,8 @@ void CWGSSeqIterator::x_CreateFeaturesCh
+     // select range of feature table rows
+     auto range = GetLocFeatRowIdRange();
+     auto feat_start = range.first + kFeatPerChunk*index;
+-    auto feat_stop = min(range.first+range.second, feat_start+kFeatPerChunk);
++    auto feat_stop = min<TVDBRowId>(range.first+range.second,
++                                    feat_start+kFeatPerChunk);
+     range.first = feat_start;
+     range.second = max(feat_start, feat_stop)-feat_start;
+     // create features